Merge https://github.com/theSwordfish/adventure
Merge https://github.com/theSwordfish/adventure