Merge pull request #1 from roughhawkbit/master

change 1
Change 2