issue #22
issue #23
issue #24
issue #25
issue #26
Merge branch 'development' into releases
issue #27