Conflicts resolved
Merge pull request #79 from nds/farm3

Conflicts resolved