Minor changes
Move method to correct module
Merge branch 'master' of github.com:dtuite/flakey
WTF