added php 5.4 support