Fix issue #17 and #19
Merge pull request #20 from FlatTurtle/feature-cluster

Fix issue #17 and #19