Merge branch 'master' of github.com:WhiteWorld/cporter

Conflicts:
	README.md
Merge branch 'master' of github.com:WhiteWorld/cporter

Conflicts:
	README.md