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