Small tweaks
Merge pull request #3 from krzysztof-gzocha/devel

Small tweaks