Add C++11 support
Merge branch 'feature'