Merge pull request #109 from jerv13/master

Update js to support dialog.
Merge remote-tracking branch 'upstream/master'