JIRA-1222

closes #104
10 files changed