Added travis support, fixed small issue