I added this change to my branch as well... I'll push this change as soon as I finish up testing the 'Entity' class.