merge
H6 part2
Merge pull request #2 from jvidalba1/staging

Staging