added alert to test
Merge origin/master