style update
Merge branch 'master' of https://github.com/msl2430/CorriAndMike