some new class (esential ones)
Merge GitHub/master