ej he fiksa bower
merge commit