Merge branch 'topic/ghi/47' into dev

Fixes Github issue #47
DELETETHIS - prevent reds