Merge pull request #30 from tmartin357/master

Naming Issue Fixes