Split the conditional logic to set partition handling into independent if statements
Merge pull request #2 from simplymeasured/update_cluster_logic

Update cluster partition handling logic