Merge pull request #497 from xsdg/cluster