Update to version 1.2.0 with new features

Tidying up the demo files, adding a few new features, better organisation of config items.