Development

Merge of stable version before creature integration.