Pushing the changes from ramyaps:fork to the updownlife:master

Steven,
Please check and pull the changes to the master.