updated a2
Merge branch 'a2'