Merge branch 'msvc2' into 'master'

Use std::vector for arrays with non-constant length

See merge request !49