Improved documentation and default implementation.
Merged in README.md