Closes #101 - for Drupal 7