fixed error for php 5.5 strict mode
Merge branch 'updated'