Development

LAst updates from devellopment branch