Optimized imports
Signed-off-by: Rack Lin <racklin@gmail.com>
Merge branch 'issue2'