wip
fix me plox
fix me plox 2
All fixed and working
Merge pull request #2 from felipeq/vector

All working, need code cleaning