Add option to enable auto capture
Bump version to 0.8.7
Merge