Merge pull request #3 from peraltaaldo/master

getting changes from Aldo
Update TestDoc
Merge pull request #2 from Lundgrenrj/master

another change in the code that i wasn't aware of.