Merge pull request #111 from mackk/master

merge
Merge pull request #13 from rockamorales/master

merge