Merge pull request #30 from praekelt/develop

Improve notifications and implement ENC
Merge pull request #31 from praekelt/develop

Fix silly alignment issue