Resolved #72 & #66.