Updated for 0.0.2 & missing log include