working on capture algorithm
Merge remote-tracking branch 'GITHUB/master'