commit version 1.0
commit by zongyi
Merge branch 'master' of github.com:ZongYi-Ali/Macaroon