fix issue 1695
minor comments edited
import from skbio 0.1.4
changelog merge conflict resolved
Merge pull request #1702 from ekopylova/fix_1695

fix issue #1695