Travis integration
Refactoring
travis integration