Added C++11 support.
Preparation to switch to class desgin.