Merge pull request #2 from CodeCoreYVR/a_and_a

Changed H1
Merge pull request #3 from CodeCoreYVR/a_and_a

A and a
Merge branch 'integration' into a_and_a