Merge pull request #404 from kazoompa/master

Bug fix