Merge branches 'fixImport', 'fixTest' and 'travis-ci'