TODO: Take care about the end of vectors
TODO: Take care about the end of vectors

Former-commit-id: 4fc5a9dc449842b00369f33a98b8b0113850ddda
Former-commit-id: f5e3cc514a9cbf20f3604adce287f16088e80474
urinieto/msaf,urinieto/msaf