Merge pull request #107 from mackk/master

merge
Merge pull request #9 from rockamorales/master

Roberto