Syncing with bkarak/master branch

Fetching the latest commits