Fixing usage-tracking + adding more tests
Merge pull request #2 from aledsage/usage

Usage