Debug
Bug fixes
Merge pull request #4 from carlacummins/master

Bug fixes