Update to demo branch

Pushing latest changes from master