Fix for #477
Merge pull request #504 from brianfeister/master

Fix for #477