Merge pull request #15 from wtsi-npg/devel

pull request from wtsi devel to master - release 49.4
Merge pull request #16 from wtsi-npg/master

pull request from wtsi master to devel (release 49.4)