conflict with BS js
Merge pull request #13 from amitava82/test

conflict with BS js