Merge pull request #2 from amacdiarmid/alex

Alex