Improved client interface defaulting support
Merge pull request #10 from josephcopenhaver/feature/improved-client-interface

Improved client interface defaulting support
Merge remote-tracking branch 'origin/master' into feature/scanner-pausing