C++11 switch

Just testing in Travis-CI