Merge pull request #197 from HeikoAdams/master

Bugfix functions.php