closed issue 52 and closed issue 53