Refactored demo to work with new output values
Merge branch 'master' into hclust