squashing merge
Merge pull request #418 from rashidkpc/fix

Bringing the rest of spencers changes in
Restored the "required_times" functionality so that stacking will work as expected.