changed all nos-prefixes to atom
Merge branch 'master' into nos-to-atom