fixing stop method test
release 2.0
Merge from master