Developer 311

Requires https://github.com/awestruct/aweplug/pull/16