Merge pull request #37 from fabiant7t/patch-1