Make thirst disablable, closes #77
Merge branch 'feature/disableThirst' into develop