Add C++0x support
Merge branch 'feature'