Bug fix
Merge pull request #19 from carlacummins/master

Bug fix