karel1980/scratchnet — pull request #34 by marc-portier (2014-03-03 08:07:31+00:00)
Title: syncing up

Replacement PR for #33 - see comments there (this lazy bum is not going to repeat himself)
This one should be merge-able.