Improve distribution version handling
Improve whitespace removal
Remove trailing whitespace
Merge pull request #1 from relev/master

Improve finding distro name and remove trailing whitespace