merged appinfo branch

Cf #352