Feature/command

Fixes #12