12/7/14 merge with patrick and refinery module is ok