Merge pull request #35 from oceans15/issue33

Issue33
Merge branch 'dev' of https://github.com/oceans15/teleport into joeybranch
Latest up-to-date version merge