Development

Merge with conflicts solved