Resolved #17