Updating from Manoj's repository

Updating to make it up to date as per Manoj's repository