Hot fix
Hot fix for alink generator
Merge pull request #46 from MengZhang/develop

Develop pull request from Meng