Improve makefile, fix travis cl, add few more functions