Bug fix
Merge pull request #24 from carlacummins/master

Bug fix