More applause, Billy Madison style!
Merge pull request #1501 from loisaidasam/master

More applause, Billy Madison style!