Feature

Feature JIRA#54: please review to merge feature into develop