Lib updated
Merge pull request #51 from mauroa/master

Lib updated