Actually implemented changes
Merge pull request #39 from citelao/hotfix-php5.3

Actually implemented changes
Merge pull request #40 from citelao/dev

Actually implemented v0.9.3 changes