Merged of conflicts and added methanol benchmark code