code done
fix done
fix done
removed unused imports
Merge branch 'master' into shrey-notify