Merge pull request #293 from mithro/simple-realtime

Basic "real time" mode (previous called "manual" mode)
Fixing the generator as discuss in the testing meeting.