Fixed #25 #26

Closed naxvm closed 6 years ago