Merge pull request #453 from Eonasdan/development

fix for issue #451
Merge remote-tracking branch 'origin/master' into development