Improving option handling, documentation and examples.