review
Merge pull request #7 from CircleCode/3.2/relecture/Eric-Brison/importexport

review