This should resolve #144
Merge pull request #149 from mkoppanen/master

This should resolve #144