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

Flakey goodness!