pulled in a fix from master
updated js