Merge pull request #5 from lexh/master

Data import work