Update Makefile
Change parameter
Use vector
Merge branch 'dev'