Merge pull request #223 from ISA-tools/development

Merging Development in to master.
Merge pull request #237 from ISA-tools/master

Merge pull request #223 from ISA-tools/development