Minor improvements
Merge pull request #1 from zygm0nt/master

Minor improvements