Feature/js 2.1.0