Fixing issue #26 + some minor fixes #27

Closed kamilakrych closed 3 years ago