Merge pull request #308 from viniciusjarina/fix242