bugfixes
bugfixes
updated docs
updated docs
updated version
Merge branch 'master' into develop

Conflicts:
	README.md
Merge branch 'release/0.7'