Fixed bug 119 in Jira.
Updated to fix of 119 bug in Jira
Merge branch 'master' into bugfixing
fixed bug 95
Merge branch 'bug95_112'