Merge pull request #551 from rhendric/master

Fix for #544