Merge branch 'atomic-correctness' into 'master'

Rewrite potentially concurrent writes to use atomics (closes #30)

Closes #30

See merge request !83