Update atom32 template
Merge branch 'testing'