Fixed #141
Fixed #143
Fixed #152
Fixed #147
Merge pull request #153 from objcow/master

Resolved issues