refactor work in progress
fixing tests
error handling
more tests
just testing
another test
last touches before release
fixing various bugs
Merge branch 'capture'