Ensuring the demo script runs only from master
Merge branch 'develop'