Some changes for ohm productive use
Merge pull request #1 from ohm2013/ohm_fixes

Some changes for ohm productive use