Some improvements

| Q             | A
| ------------- | ---
| Fixed tickets | #182
| License       | MIT

Oh, I was thinking it's `dev` dep, not hard one...