#192
Merge pull request #206 from objcow/master

#192