Bugfix.
Merge branch 'master' into new-annotations
Added comments.
Merge branch 'master' into new-annotations
Improving behavior on Chrome.