Add Basic features
Merge branch 'master' into develop

Conflicts:
	README.md