CR Second phase changes
Merge pull request #25 from abhidbydx/cr_work

CR Second phase changes