Some fixes and ran bower
Merge branch 'release/0.0.1-1j'
Moved function to avoid "this" reference and ran bower to rebuild