fixed: ebkac in ternary operation, ebkac in getID() for()
Merge branch 'dev'