Merge branch 'master' of github.com:artemshut/converter

Conflicts:
	README.rdoc
Merge branch 'master' of github.com:artemshut/converter

Conflicts:
	README.rdoc