Merge pull request #15 from kevin-moorer/hotfix_2.5.0rc01

Hotfix 2.5.0rc01
MLT-1 added 111
Merge pull request #18 from kevin-moorer/MLT-1

Mlt 1