fixed new countermeasure
Merge branch 'dev'