Pulled in import/export support and cleaned up gem
Pulled in import/export support and cleaned up gem