Added issues 023 and 024