finished issue #22 and issue #60
Merge branch 'feature-finish_issue_22_and_60' into develop