Fix strict errors for php > 5.4
Merge pull request #1 from rchavik/master

Fix strict errors for php > 5.4