More fixes...

Just some minor fixes to make it even shorter and simpler.
=D
Merge pull request #40 from GregoriusMC/patch-10

More fixes...