Sync AMTL from upstream
Merge pull request #138 from Arkshine/sync-amtl

Sync AMTL from upstream