general refactor: fixes #2 #4 and #5
update bower
Merge pull request #8 from petermelias/master

general refactor: fixes #2 #4 and #5