Merge pull request #849 from sylus/master

Fix for wet-boew/wet-boew-drupal#834
Merge pull request #850 from sylus/master

Fixes wet-boew/wet-boew-drupal#754
Fixes wet-boew/wet-boew-drupal#808