Merge pull request #1 from yavdr/master

fix start condition
Merge remote-tracking branch 'origin/testing-0.5' into stable-0.5