Update .export()
Merge branch 'master' into examples