Merging patch-2 to master

Merging patch 2