class HP changes
Merge pull request #300 from interdiction/master

class HP changes