Improved atom generation

Signed-off-by: Martin Evans <martindevans@gmail.com>
Merge branch 'To_Be_Proof_Read'