Merge pull request #2 from chadbunn/master

merge