fixed issue #569
Merge pull request #572 from Zolmeister/development

fixed issue #569