Initial commit into js_dvelop branch

Pull request for js_develop