Bug fix #98 : Merge Mcmaster's bug fixes committed between Mar 12 and Apr 29, 2014