JIRA-1223

closes #107
4 files changed