Merge..
Changes for compiling on linux...