Updated to support cluster module.
Merge pull request #1 from wehriam/master

Updated to support cluster module.