Merge branch 'dev'
Merge branch 'dev'
added prompt to example script

updated version numbers
Merge branch 'master' into dev