10-09-2016
Modified Makevars to avoid warnings