Bug fix
Merge pull request #83 from carlacummins/master

Bug fix