import/export fixes #6
Merge branch 'master' of https://github.com/middleofdreams/workload