Changes to stop method. Fixes #5