Fixes import and dump issues.
Merge pull request #3 from xiaohutai/master

Fixes import and dump issues.