Lasagna added
Jens
Merge branch '0.3'