Brought xJSFL to master