Merge branch 'hotfix/0.1-hotfix-001'
Pausing on Node.js for now. NPM isn't installing for some awkward reason! Argh!!!
Merge branch 'hotfix/0.1-hotfix-002' into develop