Merge pull request #34 from diamond-msc/patch-1