Add Chris Dziewa's solution
merge