Clean up CMakeLists.txt and fortran wrapper, but it still fails to compile by GNU gfortran
Merge remote-tracking branch 'origin/develop' into develop
Fixed a typo