Merge pull request #1 from Lundgrenrj/master

Update TestDoc
Update TestDoc
Merge pull request #3 from peraltaaldo/master

getting changes from Aldo