#197
Merge pull request #207 from objcow/master

#197