updated alert mechanism
Merge branch 'dev'