fixed issue 115 in Jira
fixed jira bug 100