improving preemption mechanism
Merge pull request #65 from BFALacerda/hydro-devel

improving preemption mechanism