more stuff
Merge pull request #1 from colinmacdonald/colinmacdonald/test2

more stuff