REL-1596: Added new combinations as requested.
REL-1596: Made changes as per code review.
REL-1596: Changed method name to make it clearer what is being adjusted.
Merge pull request #27 from sraaphorst/feature/REL-1596

REL-1596: Added new combinations as requested.