Merging changes to push to origin 3-13-14