Resolved #4 and #5