Merge pull request #1 from nickebbutt/master

Pull latest from Nick's fork
latest demo changes