merged jrollins/master