recomitting yang's changes
Merge branch 'master' of https://github.com/jalau/GRP22_18649