Implementation, closes #128
Merge pull request #129 from BlueMountainCapital/GH128

Implementation of #128 on mainline