Fix method calls
Add test cases
Merge branch 'master' of https://github.com/ircmaxell/PHPPHP