Fixed walking through walls?
Merge branch 'master'