commit from envoy - djo
more stuff request pull into djowens repo
base update
Merge pull request #1 from dyllenenvoy/master

Merge into official repo