#141 attempt 4
Merge pull request #160 from objcow/master

Fix for #141 (x4)