Merge pull request #26 from Bananeweizen/master