Some defect fixes
Merge branch 'master' of https://github.com/sandeep89/OceanCrest