Updated to work with Drupal 7
Merge pull request #3 from flacoman91/master

Update to work with Drupal 7