Review Caelum

generalise it or replace it

(RM-16 from redmine: created on 2011-08-06 by Lukasz Gromanowski, , closed on 2012-03-02 by scrawl .)