Fix bug #5 in command parsing.

Closes #5