Merge pull request #1 from Angelfirenze/master

Problem #1: Possible MS Word deletion...
Merge pull request #2 from Angelfirenze/Pax

Merge pull request #1 from Angelfirenze/master