Improvements to Atom conversion.
Merge pull request #2 from stevehansell/master

Improvements to Atom conversion.