merging recent fixes into master #25

Closed lutsik closed 4 years ago