Bugs Fixed
Merge branch 'Reviewer' of https://github.com/suneelprakashriktam/PicaPoco into Reviewer