Merge "Fix phan errors by improving documentation (#10)"