Add Import/Export -- Fix #16 and #17