Version 0.4 dev

Some refactoring. Bug fixed in the command handling of the
CommandPreprocess Listener