fixed issue 115 in Jira
fixed jira bug 100
Merge pull request #724 from Bars107/master

Fixed jira 115 and 100 bugs.