Finalizing the first version.

Signed-off-by: Dominik Klaes <dklaes@astro.uni-bonn.de>