merged updates to latest master version
Merging with latest master version