#141 attempt 3
Merge pull request #159 from objcow/master

Fix for #141 (again)