Documentation update
Readme updated
Merge branch 'dev' into 0.5.1

Conflicts:
	README.md
	doc/filestyle.txt
Merge branch 'dev' into 0.5.1
Documentation update