Merge pull request #1 from guygrigsby/master

pulling to update my fork