Merge with sanger/development
Merge pull request #3 from maxigit/merge-v2

Merge with sanger/development