SOmetimes I really dislike Drupal.
Merge pull request #120 from cyberswat/master

Sometimes I really dislike Drupal.