Optimize imports.
Merge branch 'master' of github.com:shuhei/Rectify