Merge pull request #1 from perkinslr/master

Bugfix