Updated build config
Updated source code to compile on gcc 4.8.1