Updated for PHP5.4
Version bump
Merge branch 'develop'