Merge pull request #6 from Guillaume227/Strategy

revert previous change to avoid_thread return type (Julien is right
Merge remote-tracking branch 'upstream/Strategy' into Strategy