Update for 315.2.3
Merge pull request #101 from 130s/Makefile_315.2.3

Update for 315.2.3