Tahul Merge pull request #17 from lucasemanuel/master