Change suggestions from James
Merge pull request #88 from CodeCoreYVR/style_changes

Change suggestions from James
Merge pull request #89 from CodeCoreYVR/integration

Integration