Merge remote-tracking branch 'origin/develop'

Merge remote-tracking branch 'origin/fq'

minor script fix

doc fixes

Merge branch 'master' of github.com:searchivarius/NonMetricSpaceLib

Update README.md