Updated comments and fixed Travis-CI build