Fixes #29
Fixes #28
Merge pull request #30 from tmartin357/master

Naming Issue Fixes