Merge pull request #1 from cavedude00/master

Merge from master
Merge pull request #2 from cavedude00/master

Merge from master
Merge pull request #1 from regneq/master

Merge pull request #1 from cavedude00/master