Last updates
Merge pull request #19 from plantener/Test

Last updates