Fix master by using Vec and adjusting
Merge pull request #142 from alan-andrade/master-fix

Fix master by using Vec and adjusting