Merge branch 'develop'
Merge branch 'develop'. This fixes #2.
Update getting-set-up.md
Update getting-set-up.md
Update README.md
Update README.md
Tweaks.
Merge branch 'master' into develop