merge from 'Heliosearch/heliosearch'  5e7e6b0

merge from 'Heliosearch/heliosearch'  5e7e6b0. 20140524