Master update

Bring all changes into master. Things work!