Pull requests merged in and bower.js file updated so that it works on linux