Faster imports as port #198
Fixed bug found by Travis
Merge pull request #214 from Gallopsled/faster_import

Faster imports as per #198