Merge branch 'master' into develop
Clarify run instructions
Merge branch 'develop'
Fix download locations