Merging patch-3 to master

patch-3 to master