Resolved #31 yay!