Merge pull request #1 from mmcguinn/mm326

closes #327