Resolved #65 and #68