Merging Cody's updates to the Master branch