Bug fixed
Merge remote-tracking branch 'origin/pele' into mazanuj
Create dataError checker
Bug fixed