Merge branch 'dev'
Merge branch 'dev'
Updated readme
Fix link to simfile module
Merge branch 'dev'

Conflicts:
	README.md
Merge branch 'master' into dev