small changes
Merge branch 'master' of https://github.com/sumo2478/CSM117