felipehw Merge pull request #97 from felipehw/master