Merge Master 

Merge Vivek's changes into beta branch