Merge pull request #1 from travis6888/develop

update master
Merge pull request #2 from travis6888/master

Merge pull request #1 from travis6888/develop