Merge pull request #1 from amacdiarmid/alex

test pull