fix issue#8
Merge branch 'master' into simple_import
fix tests