Development

Updating master with a stable development