Feature/review atomic annotation properties

Fixes #99