Merge pull request #23 from matiassingers/patch-1