Merge kulish sidorov

Issue #170 
Issue #168