Updated to build under linux