whats here
Merged and fixed issues
Fixed Teleport bug
Fixes #1
Fixes #2
qMerge branch 'master' into pieces