Merge untracked changes
Add PhpDoc comments and use Wordpress conventions