Manual merge of xyan075 Points connectivity clean pull request (#123)