Develop

Merge latest improvements