Merge pull request #4 from justingreco/master

merge pull request #2 from justingreco/master