Merge remote-tracking branch 'nicholas/master'
First version of the modifier - not working yet
minor changes
Merge branch 'master' into wfmod
Fix from Martin Felke, thanks a lot
new directory structure
new directory structure