Master MAJ
Merge pull request #2 from Luissoo/master

Master MAJ