ciconia Merge pull request #41 from WakaJoekoe/master