More fine tuning of timing
Merge branch 'master' of github.com:wirru/hshake