Merge pull request #5 from emrickgarrett/master

Update to merge