Consistent option names.

Support regexp in expand(), comment code.
0.0.2