Added template inheritance
Merge branch 'master' of https://github.com/KPWhiver/stocksim