fixed issue 115 in Jira
Merge pull request #723 from Bars107/master

fixed issue 115 in Jira