merged from upstream
setup git-preconfiguration, minor changes in comments
Fix of pull request #64