Some tweaks
Merge pull request #2 from TheSisb/master

Some tweaks