omd.0.4: new features (and a few bug fixes)
Merge pull request #1066 from pw374/master

omd.0.4: new features (and a few bug fixes)