Merge pull request #1 from phalcon/master

Getting changes from phalcon master