Added Travis configuration
Refactoring