Merge pull request #177 from justjanne/patch-1