dev
Merge https://github.com/Francis-Underwood/kNotice