Merge: More documentation in src