Added more unit tests and fixed minor bugs
Fix Build
Merge pull request #52 from wshafer/master

Added more unit tests and fixed minor bugs