Added support for elevators and stairs
Merge branch 'origin/master'