Merge pull request #1 from zjelveh/master

agglomod pull request
Merge pull request #2 from zjelveh/master

agglom_cluster fixes