Add the start of #11, not solved.
Added solution to #40.