merge from 'Heliosearch/heliosearch'  0.06