Merge feature/include client js for #179