merge with most recent version
add js build