update
Merge git://github.com/nng555/SDSCREHS2013