Bug fixes
Fix bug in last commit
Merge branch 'master' of https://github.com/andrehrf/magicphp