Build #28:   Merge pull request #41 from sdevenes/last_fixes Last fixes on branch master about 5 years ago