A few tweaks here and there
Merge pull request #1 from satrix-/master

A few tweaks