Use C++11 initializer semantics
Add stub matrix class