Merge pull request #31 from ejohnson44/master

Fixing the Titling Issues and Doing Some Refactoring