Some optimization
Merge branch 'master' of https://github.com/alex-kr/cf-project