Getting code synced up properly with the changes made in the master branch.