added feature 5
Merge branch 'develop' into release/1.0