essential fixes
Merge branch 'master' of https://github.com/karel1980/scratchnet
Merge pull request #20 from marc-portier/master

Fixing left-over glitches from refactoring