Lib updated
Merge pull request #55 from mauroa/master

Lib updated