Cosmetic changes.
Merge pull request #20 from XhmikosR/master

Various