Fixed & improved option handling.
0.2.2