Merge pull request #223 from ISA-tools/development

Merging Development in to master.