Added todo
Fixed php 5.3 compatibility