adapted for 1.4.0
working on #17
export done