Merge remote-tracking branch 'incubaid/master'

Conflicts:
	INSTALL.txt
	setup.ml
travis: add build status badge