modi build status
Merge branch 'dev' into master

Conflicts:
	README.md