omd.0.3
Merge pull request #1058 from pw374/master

omd.0.3