Improved (using last version of Atoms)
Merge pull request #1 from soyjavi/master

Improved (using last version of Atoms)