closed #26
Merge branch 'issues/26' into development