Done #228 Merge Mcmaster's bug fixes committed between Apr 29, 2014 and Nov 4, 2014