Issues #233, #236, #237

Version for Munich review meeting