Possible exit condition fix
Exit cleanup
Merge branch 'master' of https://github.com/aferr/TimingCompartments