* This should close Issue #24
Merge branch 'brimstone/issue-24' into dev
Merge branch 'dev'