Merge branch 'HTMLexport'
get ready for v0.9.6
Merge branch 'master' into HTMLexport