Patch for #313, Implementation of #315 (Importing)