minor fixes
Merge pull request #6 from olivier-squid/master

minor fixes