hpies ready for code review
Merge pull request #270 from danmergens/hpies2

hpies ready for code review