Better alert
Merge branch 'master' of https://github.com/m3my/application