Merge pull request #37 from danny-dyers-chocolate-homunculus/walter

Walter
Conflicts