Updating Files on Master Branch with Garrett's lastest version

I have merged our master branch with Garrett's latest version, as of Feb 2nd.