Merge branch 'master' of github.com:nodename/clevolution

Conflicts:
	README.md
Merge branch 'master' of github.com:nodename/clevolution

Conflicts:
	README.md