Merge pull request #78 from dawsondiaz/master

merge