Some minor changes.
Improved default demo.
Bugfix in Color class
Merge branch 'develop'