Made the changes in the latest commit 0ea27787005df0ebefef1e7c0fc6a01137a4016a.
Please review.