fixes #31
starting script
Merge branch 'dev'

Conflicts:
	build.sh