Latest commit should have the feature changes you suggested.