Merge pull request #27 from ilmari-lauhakangas/patch-1