Fix whitespace and \t
Remove mapper
Merge pull request #7 from yasselavila/develop

Latest changes