MODCLUSTER-392
Merge pull request #62 from Karm/master

MODCLUSTER-392