#21 no longer work with Drupal Commerce current dev version. Modified code a bit and make MR instead.