Added testable demo2 and imagecontainer.h/.hxx