Resolved #14, #15