Fixes main file
Fix functions.php
Merge pull request #6 from chriscct7/master