Patch in Improvements from working to master