Merge changes pulled from Damian
Merge branch 'master' of github.com:adamvi/Demonstration