Issue #47

New export type