Fixed AS retreival
Merge branch 'dev'