Add some feature
Merge remote-tracking branch 'chupa/work'

Conflicts:
	README.md