Add optional context handling
Update documentation
1.0.0