Merge commit '31e8aee' from branch r04_doc.

Merge commit '7f855ab' from branch r03_doc.

Merge commit 'f58ee5a' from branch r02_aRMSD.

Merge commit '922ba23' with branch r01_settings.

Add files via upload