Adding in demo source code
Merge branch 'master' into Bug-With-Enter-Button