autohp, part deux
Merge pull request #111 from maxtherabbit/master

autohp, part deux