Added edge case check on fix for issue #41
Added CombinedStimulus