Added teleport command and fixed thread-safety problem
Merge branch 'sander'
Merge branch 'ferrybig'