#163
Merge pull request #165 from objcow/master

#163