Merge pull request #21 from wtsi-npg/devel

Devel
Merge pull request #22 from wtsi-npg/master

pull tag from master to devel