Testing and bug fixes @1:28
Merge pull request #12 from aguibert/master

Testing and bug fixes @1:28