Alignments and added support for Travis-CI