update from jsbin/pennyworth