bug fix and code cleaning for annotation container
bug fix and code cleaning for annotation container

jneuendorf/code-annotations,jneuendorf/code-annotations,jneuendorf/code-annotations,jneuendorf/code-annotations,jneuendorf/code-annotations