Merge pull request #42 from ProPercivalalb/master

Gimme updates!
Updated teleporter - works? maybe? idk...
Merge pull request #90 from chylex/master

Updated teleporter - works? maybe? idk...