Fixes after review
Merge pull request #1 from MiKom/master

Merged review fixes.