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