Merge branch 'release/1.0.0'
Fix Conditional Comments in header
Style Fixes
Bump version
Merge branch 'hotfix/1.0.1' into develop