Commit changes from master and myself

Commit changes from master and myself