export functionality
Merge branch 'master' into CGS97