Merge pull request #27 from palantirnet/master

Merge GitHub Master into Drupal Dev Branch