Use vector
Merge branch 'dev'