Conflicted buglist fixed
Tweaks made
Tweaks made
Tweaks made
Merge pull request #83 from kaustabh/master

Conflicted buglist fixed