Update Master to Export/UI Changes

Do you think we need to test this further?
Use 2 (not 5) spaces for indentation.