More updates to getting started
Merge remote-tracking branch 'origin/version2' into version2