Fixes for current Siena and PHP versions
Merge pull request #1 from trustmaster/master

Update for current Siena