Fix #36
Merge pull request #37 from marhei/patch-1

Fix #36