Merge pull request #110 from XhmikosR/master

Varius style fixes.