merge changes
Merge branch 'master' of https://github.com/bigz94/typescript-totaljs-definitions
correct some simple mistake