Added setup for #18.