Adding latest version from Drupal sandbox http://drupal.org/sandbox/drozas/1970490