tet
Merge remote-tracking branch 'github/master'
Refactored names of classes and methods