Merge pull request #152 from hintjens/master

Fixed verbose logging
Fixed #147 properly