changes
Merge pull request #1 from bwstud/master

changes