[2] Fixed some errors and updated names.
Merge pull request #2 from strickten/master

Error fixing and name updating