minor
conflicts
Merge pull request #56 from saulelis/hp

minor