Adds stop option
Merge branch 'master' of https://github.com/cesarrdz/ParFlow