Merge pull request #273 from ISA-tools/development

Merging 1.7.7 in to master.