Merge latest importing changes, addressing issue #16