Refactoring
Added travis ci support