Merge branch 'master' into matrix
src: added 'base.hpp'
src: inherited 'struct base'
Merge branch 'complex' into matrix
Merge remote-tracking branch 'origin/matrix'