Merge branch 'topic/ghi/37' into dev

Fixes Github issue #37