marcelamelara Merge pull request #267 from adityasaky/fix-231