Merge pull request #28 from Bananeweizen/patch-1