Updating 2nd branch to mirror the master. 

I think this request will update the 2nd draft branch to the master. I'm not absolutely sure, it's past midnight lol. Please make sure.