Resolved #13