added class methods
Merge branch 'typescript' into ben-changes