Pulling in updated code from master

Pulling in updated code from master