Build #6:   Merge pull request #6 from crediborg/develop Refactoring on branch master about 5 years ago