Merge pull request #49 from mohlek/patch-1