- fixed #114
- optimized logging