v.0.0.1 (client side modifications)
Merge origin/master

Conflicts:
	Readme.md