Merge pull request #1 from cavedude00/master

Merge from master