Merge pull request #1 from tvjames/master

Local Changes