Merge pull request #2 from Geodan/master

merge from origin
Bower update
Merge pull request #9 from tomvantilburg/master

merge from Tom