More flakey goodness
Merge pull request #230 from psav/flakey-goodness

More flakey goodness