commit from 12/16/13 15:11:53. 14 deletions, 19 adds, 1 modifications