issue #21
Merge branch 'development' into releases
issue #27
issue #28