Merge pull request #1 from vanderh0ff/master

Merge pull request #1 from Red5d/master