Fixes for functions.php
Merge pull request #1 from Tristanx/patch-1

Fixes for functions.php