modify alert calculation
Merge branch 'master' of https://github.com/2014-2/001