Merge pull request #120 from felipevicens/master