Updates and bug fixes
Updated tests
Added usage example