Added functionality to MovingAverageEnvelope class
Merge origin/master