Story description

Story: #149
Task: #225
all features done

Story: #149
Task: #225
Merge branch 'stories/149' into devel