Fixes issue #156
Merge pull request #157 from maxatwork/master

Fixes issue #156