Tweaks
Merge pull request #1 from palistov/hop

Tweaks