Initial commit. Introduce solutions for #40 and #41.