Initial commit for #7.