Merge branch 'master' of github.com:parvladimir/wwc

Conflicts:
	README.md
Merge branch 'master' of github.com:parvladimir/wwc