Misc bug fixes
Merge branch 'master' of git://github.com/kachkaev/php-r