RG-210 Fixed alerts
Merge pull request #187 from Edzelopez/RG-210

RG-210 Fixed alerts