Merge pull request #18 from rockamorales/master

merge
Linea XD
Merge pull request #42 from mackk/master

merge
Merge pull request #14 from rockamorales/master

merge