Demo Update push to master

Pushing develop to master for demo - current working version