Added stop goal, fixes #23