merge pull request #2 from justingreco/master