Fix #257 Merge Mcmaster's bug fixes committed between Nov 4, 2014 and Nov 28, 2014