Optimized imports
Merge pull request #328 from JeroenDeDauw/imports

Optimized imports