multiple updates, to version 2.1
Merge pull request #10 from macmillanpublishers/Matt

multiple updates, to version 2.1