Fixed some minor errors and naming conventions
Updated README
Merge pull request #1 from kmjungersen/master

Syncing develop and master