Adds H3
merged branch2
Merge pull request #1 from tjstalcup/branch3

Branch3
fixes conflicts