Add C++0x support