Merge pull request #11 from Yorirou/7.x-1.x

Adds missing mappings.
Fixes first step skip on walkthrough replay.