Merge pull request #10 from uProxy/ts-refactor

ts refactor #1
Merge branch 'master' into ts-refactor