Merge pull request #27 from palantirnet/master

Merge GitHub Master into Drupal Dev Branch
Merge pull request #28 from palantirnet/7.x-1.x

Merge pull request #27 from palantirnet/master