Merge pull request #157 from maxatwork/master

Fixes issue #156
version 1.10.26