Formatted Modulefile. Ready for release
Merge branch 'master' into develop

Conflicts:
	Modulefile