combined classes

Signed-off-by: Alexandr <yakovlev@primepix.ru>
Merge pull request #4 from xescoder/master

combined classes