Closes #175.
Merge branch 'master' of https://github.com/genometools/genometools
Merge pull request #177 from standage/master

Closes #175