Feature/accept#69