add amd-loading
Merge branch 'dev'