Added support for a second vector

...and fixed some mistakes with git