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