fix some errors
Merge branch 'master' of https://github.com/jobinrefer/dev
...