Merge branch 'develop'
Merge branch 'develop'
improved minor presentation
Merge branch 'master' into develop

Conflicts:
	source/index.rst