commit changes from guillimin
changed for compilation on guillimin