Updated
Merge branch 'nfr_tag' of github.com:dreamsxin/cphalcon into nfr_tag