CecilHarvey Merge pull request #24 from nbzwt/master