Merge pull request #435 from mk270/generalise-importers

[merge]: Generalise importers - from @mk270.
Merge branch 'master' into 3rd-try-merge