Lib updated
Merge pull request #57 from mauroa/master

Lib updated