Towards 1.10 release

Modification of #42 and #46