Improve sample import file. CLoses #1780