Fix and update
Merge pull request #5 from nfrancois/importFix

Fix and update