Pull changes from Chris F 03/12/14