Fixed a bug with capturing
Merge remote-tracking branch 'origin/master'