Updated for new version + fixed some issues #198

Closed kazihorka closed 4 years ago