Added Travis-CI support
Some improvements