Development

Development is mostly stable, merging to master.