Merge pull request #36 from kevin-moorer/MLT-300

MLT-300 1
MLT-300 2