Use commander

Fixes #7