Merge pull request #216 from genome-vendor/master