Merge pull request #31 from mor1/master

cleanups and omd support