Ported first modifications to files.

References #733.
Merge pull request #80 from claudius108/master

Ported first modifications to files