Bugs fixed and Lib updated
Merge pull request #53 from mauroa/master

Bugs fixed and Lib updated