Merge pull request #58 from Maaack/Maaack-patch-1