restore vector changes
fix windows build
Merge pull request #24 from pchan126/feature/template_vector

Feature/template vector