fix for issue #456
Merge pull request #457 from atabary/development

fix for issue #456