Smarted (but uglier!) parser.

Issue #84
Some more examples in `--query' section.