fix issue 23
Merge branch 'master' of github.com:QSCTech/freshman