Merge branch 'AtomClass'