merge from 'Heliosearch/heliosearch' 

merge from 'Heliosearch/heliosearch'  'd8e69d7' 2014-05-20