fixes #30 - integration of hz step 1 complete