Minor Updates
Merged changes from master