Make some changes followed GeekAn's comments
Merge branch 'master' of https://github.com/crike/crike into ben