Signed-off-by: Raugharr <drbrotz@yahoo.com>
Merge https://github.com/Raugharr/Herald