Merge pull request #1 from vokalinteractive/master

pull from upstream
Update hotdog.go
Merge pull request #21 from StoicJester/master

ROBITS TAKE OVER