Resolved #33 and #34