Merge pull request #1 from rweng/master

Update
Merge pull request #107 from ricardodovalle/master

Merge pull request #1 from rweng/master