Readme
Merge branch 'configurable-annotation-rendering'