Merge pull request #20 from rockamorales/master

Merge
Merge pull request #46 from mackk/master

done