Update Master to Export/UI Changes

Do you think we need to test this further?
Prefer `Object#is_a?` over `Object#kind_of?`.