Small Fixes that bugger me a lot...
Merge pull request #6 from paroxp/master

Small Fixes that bugger me a lot...