Improved import so it will pass Travis CI and play nicer