merged the changes from codys repository on 3/27/13