fix 2 bugs
Merge branch 'master' of https://github.com/jobinrefer/dev