Changed script
Merge branch 'devel'

Conflicts:
	.travis.yml