Fnoop - 2018-07-15

Note: changing #endifxx to #endif fixes compiling.