shift id checking corrected
Merge branch 'master' of https://github.com/jijithvs/epm