Addition to 0.2
Merge branch 'master' of https://github.com/SomeCommonGuy/FoF