16ddced Merge pull request #92 from luanmuniz/fix-after-conflit