Linux support. Builds on g++
Fixed funky merge