Fixed minor bugs and implemented iteration behavior in walking
Merge remote-tracking branch 'origin/master'