remove duplicate function
Merge pull request #285 from volvet/develop_b

remove duplicated function
Merge remote-tracking branch 'upstream/master' into travis.osx