Merge pull request #1 from travis6888/develop

update master