thecloudstomper in das haus!
Merge pull request #998 from williamcheung/master

thecloudstomper in das haus!