added brendans changes.

Signed-off-by: Max Kossatz <mk@archify.com>