added Gwens work
stop command should not flush buffer
Merge branch 'new_branch_name'