Jhow dev

Merge jhow