little fixes
Merge branch 'feature/smarterCluster' into develop
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into develop