Fixes multiple issues and feature improvement.

Fixes issue #29 and #31, added usage tracking. And minor update. 

See changelog.