From work (12/3/2014): Minor modifications to m files. Sent to Jeff