* Fix: php 5.3.x support and cosmetic changes