Optimize imports.
Merge pull request #20 from eric-wu/master

Optimize imports.