Added Unit testing, and bug fixes
Merge branch 'master' of github.com:jaredjbarnes/BASE