Updated with the latest code from Master

I pulled the latest master into your branch so that it will merge cleanly with master.