Merge pull request #30 from fedwiki/ward/drop

Strange, merged this locally but Github doesn't recognise that I have...
Merge pull request #31 from fedwiki/lineup

Merge pull request #30 from fedwiki/ward/drop