Added c++0x compatibility.