Merge pull request #1 from Belelros/master

Making it work with latest bower
added tests