Flakey goodness!
Merge pull request #188 from psav/flakey-goodness

Flakey goodness!