Updates - now compiles with gcc 4.8