fixed #31
Merge branch 'feature/alipay-import'