Optimize imports
Merge pull request #98 from wmde/optimize

Optimize imports