Added brackets to stop compiler warning
Changed from -O3 to -Ofast (for compiler optimization)
Cleaned up header files
Merge branch 'testing'