Final polish.
Merge pull request #1 from skrenek/master

Final polish.