Another try
Merge pull request #9 from FoxUSA/release-2.5.4

Another try