fix issue #10
fix issue #8
fix issue #8
update capture