Fixed #147 properly
Merge pull request #153 from hintjens/master

Fixed #147 properly