0.0.5 bower fix
Merge remote-tracking branch 'origin/master'