Merge pull request #1 from Red5d/master

Update