Fix for merge
Merge pull request #45 from deedubs/master

Merge fix