progress
Merge pull request #2 from craigspaeth/master

Added tests and building API