CLI prints out some junk about hp + str
Merge remote-tracking branch 'origin/master'