Update for recent selector changes @github; Gist code is also changed