Changed to command

Fixes #3
Fixes #4