Add travis
Fix travis
Merge commit '4ec0060'
Merge commit 'cfdc91f'