clean up
Merge branch 'master' of https://github.com/Aminix/smax-capture