modified:   src/capture.h
	modified:   src/device.cpp
	modified:   src/device.h
	modified:   src/main.cpp
Merge branch 'master' of https://github.com/thasenpusch/cappy