merged all changes from matthewp into bower package