merge from 'Heliosearch/heliosearch'  2014-05-30

merge from 'Heliosearch/heliosearch'  2014-05-30