Hendricks cerebrum

Merge into Wildbytes' cing master. Changes from Cerebrum peculiaris project (hendricks)