Merge branch 'hotfix/nilerror' into develop
whoops.
Merge branch 'release/0.3.1'