Give Master new life

This is an attempted fix for Issue #95.