Merge branch 'hotfix/id/372' into develop refs #372
refactor spec refs #483
Merge branch 'release/0.0.3'