Random stuff
Merge pull request #134 from mpdavis/random

Random stuff