Merge recent changes

Merge recent changes of @dpvc