fix example
update travis&makefile
merge