Merge pull request #2 from amcbrearty/hobbit-feet-feature

Hobbit feature changes.
Merge branch 'master' into hobbit-feet-feature