Working version

!! Not working: stopping live capture on count is not working [disabled
ui temporarily)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/Reader.java