Updated #148 so it can be integrated
Merge pull request #379 from camilonova/more-imports

Updated #148 so it can be integrated