Updated Demo branch to reflect current demo versionUpdated Demo branch to reflect current demo version