52c17ed Merge pull request #95 from leobaiano/issue-94