Updated README and demo
Merge branch 'master' of github.com:lopis/colme