fixes #4 fixes #5 #6

Closed mavarazy closed 4 years ago