Added clustering support
Merge pull request #13 from mbarto/cluster

Added clustering support