Working Build 0.1
Merge branch 'master' with 'origin'.

Conflicts:
	README.md