gcc 4.8 compatibility fixes; cmake added