Bug fixes
Bug fixes
Bugs fixed, tests updated, tests pass
Added test data
Merge pull request #4 from carlacummins/master

Bug fixes