Final changes for a stable version

Putting this in a new Branch "stable"