Some tweaks and corrections
Merge pull request #4 from alucryd/master

Some tweaks and corrections by alucryd.