Fixed #148
Merge pull request #179 from objcow/master

#148