Merge pull request #1 from kbjohnson90/master

merge