dowem Merge pull request #23 from IBM/boland25-patch-1