prod

changed hack marlin.cpp to 0.6