With Sienna stuff
Merge pull request #7 from uh-joe/master

Updated with Sienna stuff and UH Core