Merge pull request #35 from endeveit/master

Fixing issue phalcon/incubator#22 and other improvements